Issue #6 - First compilable ORM commit