- Lots of changes to the class structure

Would like to finish tonight but I am too tired, i'll finish it
tomorrow.
- Forgot