small overhaul
bad stuff
Finish overhaul