Super a lot of useless changes, started refactoring