wip
get it building again