adding these two back into the repo
Merged init changes from dev