Finished the initial class structure