- Added comments
- Commented out functionality which isn't tested