Laid out some classes, added some methods