Re-factored and stubbed out data retrieval