Re-Commiting everything I had

Putting everything I had back into the right place.