first pass at working build