Got some of the ORM stuff working !