Intermediate Upload

This is a commit so I can work on this on another computer.