More refactoring
More refactoring. Getting there now
Why did I ever think it was a good idea to split that file?
Removing loading indicators