Big squashed rebuild (I messed up the git history :s)