Finishing up class structure