Committing 10/27 files, fixes #2

Here's Andrew's code as it was from the 10/27 build.