alot of stuff, pre-save before cleanup and mini-refactor, performance is suffering from all the jumbled JS