added todos
ignoring swp
todo