Much closer to completion

Minor things left, and lots of testing, before release