UNTESTED Refactoring
STILL UNTESTED. Fixing some obvious errors
Merge pull request #14 from ragmondo/rjj

Rjj