Building out class structures
Building out class structures