Large check-in. Did way too much without a commit. Things are working pretty well at this point.