Trying to edit Nick's changes locally and then merge with master.
Nick's Changes
Nicks additions merged with original code.