update to get CLI working
remove cruft, update test.