WIP. Refactoring, Git Cleanup.