Initial changes moving towards DI