Cleaning various operations. This commit is large and not nice. Next up is to fix naming conventions.
Fixing all conventions, I think.
Ignoring any merge backup files
Removing the defitinitions file that contained the todo code