New circle thingy, outro
Fix up core
Merge branch 'master' of https://github.com/jcowles/demo-13