Progress on struct object -> Object Class