improved, see todo
Merge branch 'master' of github.com:/mattvenn/cad