wip
wip
very much a work in progress
Merge branch 'lets-make-this-work'