Taking all the new stuff from the dev branch