Commit 1 - uncommented

Thought I should upload a working version before I break it again.