Changed back to last commit

waiting until I can get all my changes up at once