I should really start testing stuff more before committing...