Final Version

Apparently I forgot to comment out a testing statement.
With that fixed this should be ready for project use.