Finished class structure

tests missing