working....BARELY
Moved to static methods in class