Committing all uncommitted changes

I think Kory had the final "closest to working" version that we turned in; I'm just putting this up on the repo so we've got a copy somewhere (for whatever it's worth) in case I need to free up this space on my local disk. :-)