Pushing to switch dev comps
Switch computers, big mess
Clean up, fix org class
Remove commented lines
Remove unused method
Merge pull request #2 from tswizzy/ENG-13

Eng 13