fixed the extreme overuse of static methods
more un-static-ing