WIP: Add speedups

Open Phileas requested to merge speedup_builds into master

Merge request reports