Finally compiling!!

- some bad design code to be commented out
- others things that can be done better...