Adding a class to the file. Doesn't seem to work.
Refactoring for decoupling
More refactoring