Committing beginning of linear recursive refactor so I can keep working on another machine
Merge branch 'master' of https://github.com/anaximander/aesthetic