Moved into Dev branch. Replaced all the stuff I took out for the production version