Synch to Current Dev Snapshot

I hadn't been using any VCS for my development of this project. This is
an update to synch all of my changes thus far.