- Refactored classes
- Added TODO's