Bring all of my work into the dev branch for further work

Bring all of my work into the dev branch for further work #149