Move OO to Design