Adding class structure. Next step, library wrapper