Refactoring | Extracted to smaller methods
Refactoring | Converted subject search to class from free hanging methods | <Ajay>
Refactoring | Converted free hanging methods to classes | <Ajay>
Commenting out subject_search tests for now - refactoring in progress | <Ajay>