moving to inherits class structure, stuff is broken