Whoops forgot to Commit! Did lots of things…

And… We accomplished everything without the service…. Going to work on
that in the AM… time is running out for me! Dang it!!! time to
refactor..