Some resource diddling.
Merged Scott's shitty shit.