Cleaned up the code a bit and now using the default repository.