wip, handing off to jordan