Refactored, got commits to work with Git.