More Story Done

Story mostly complete decided to do a commit to preserve the work that
I have done to this point.  Some small bugs fixed as well