did some refactoring, and probubly some other stuff. .... GIT!