Intermediary push as work is done on new things
Merging fix for dev branch