merge WIP back into justin's changes