Finished up basics for ORM classes

Still need to finish tests though.