5th push

Working overall.  New functionality to come.