Stubbed out code & refactored