V1 of class structure

Still working on it but comments are welcome!