refs #93, move big transaction work to master