Changed static methods to instance methods, changed references to old class variables to new instance variables
Changed static methods to instance methods, changed references to old class variables to new instance variables

jlindsey/scapeshift