Some work done
Merge branch 'dev'

Master up to date
Decided against destroying