WIP: dev2 #3

Closed
collins wants to merge 3 commits from dev2 into dev