more build work (still WIP)