Working on ORM code some more

Fixed issue where the various lazy loaded properties would only return
once.
Started adding in various checks so that if a cyclical graph occurs, it
won't break things (next is code to make the updates smarter).