Dammit Dammit

Double dammit. I need proper testing.