bulk commit pre refactor/redesign