Making click track way better
Merge branch 'master' of github.com:mgbelisle/zoe