Add Entry functional again

clickSave() works again.  Lots of changes because of we added "final" to
the save actions.