Sorting out dev environment stuff