removed a lot of code, fresh start