Commit 12

Stripped down to basics again. We'll see if it works.