moved everything to a development branch and cleaned out master