7974baddf5
Move the object type mapping and such to the base controller to de-dupe
Move the object type mapping and such to the base controller to de-dupe