Add the gitignore rules
Minor refactor of the context switching