getting ready for major cli work
save before merging with Allisons goodness
merged in Allis changes
added lots too entry and entry_test
some progress
progress save