Implemented full class structure

Ref #10