Updated ORM a bit more

Moving over the actual property loading code.
Added some contracts.