wip - working on Domenic's changes