Fleshed out most of the structure of what each class will contain