Lots of changes. I am syncing out to GH to make sure I don't lose
anything and to make sure I can sync with my desktop.