ORM Fix

ORM fixed 80%
Controller test