Whoops, the last code dump added some features still in testing. Reverting back to a working code tree.