Added in skeleton classes. Probably need a goal class too