fixing and futzing, wip