Moved dev code to dev branch