Builder editability
Merge branch 'master' of github.com:amark/Sciflick