MasterWorking

Master branch working. Should branch to develop to add functionalities.