Started transitioning models over to OBJ pending parse error fixing