Moving things around, intermediate upload

I'm going to work on this on another computer.