Completely working

Adjusted everything so it should be ready to go. Now I have to add in
everything that was committed to the old project since this project was
created.