All Tests OK - working on orm integration 50%