Add to gitignore
Refactor in progress...