Updating from original

Updating Shaun's fork with the changes made in Matt's original fork