Moves to object based design