More stuff refactored.