second pass wip
intial pass -- we have a working build!