look at those numbers go! also: some refactoring...should be more to come