working base
refactoring
.gitignore is now working