Big ass refactor (lots of code removal)
Major simplification
fix import