Finished merge
Back on track, clean build setup, easy peazy