started with object-editing infrastructure
Merge branch 'master' of https://github.com/Frotty/24Challenge-3
Merge branch 'master' of https://github.com/Frotty/24Challenge-3