Final Version

Not many changes to the code, just slight bits.