Massive refactoring- removed most static methods.