Added basic classes, need to think this through before continueing