James Work 5.11.14

-General changes to system