Attempted to fix while loop
Fixed merge development
Final touches to the development before end of class