Tried to move things, not sure what will actually happen
Merge branch 'master' of https://github.com/woodsb/WorkingNoms