More singleton stuff
Update .gitignore