Moving some more methods around a bit and refactoring.