Added exceptions
Added missing self
Minimal changes to get it working :)
Added swp files to .gitignore