Mostly done #6, automatically gives us more performance and more sanitizion at the right places