working on 12/22
Merge branch 'dev'