Tuesday update delayed till Sunday

Update: Sorry, this week has been a mess. I'm getting close (and going through some more bugs that were reported) and I've just about cleaned up the warlock code base changes from DB (separated them out since they aren't going to be part of the baseline).