I'm working on this on two computers, so this is just in progress, I'm uploading it so I can download it.
