Rafactored out the IRepository.cs issues