Refractored some stuff
Turned validation back on. Whoops