More Class structure
Finished class structure