Classes Set up

cleaned up for readability, forgot constructors