added all previous progress, upgraded .gitignore