End-of-day commit. Fixes #4, however with lots of extraneous debugging which will need to be removed.