Tidng up code, and adding my details and my teams mocks views