Improvements

Changes:
- Adding skeletons for other necessary files
- Colors now determined by delegate
- Cleaned up test app