Renaming stops class.
Adding in structure for tests.