Lots o' additions
Damnit!