Still far from optimal -- looking for build improvements!