My changes

More changes here
Merge pull request #5 from mattdvhope/front1

Alex's changes