bulk refactor - in progress ...