Massive changes to try out some new techniques