I'm not unhappy at bit by bit restructuring...the two additions seem fine, ditch the current three and build up from there.