testing stuff\!
AAGHHHH SO MANY MESSAGES
Merge branch 'master' into marcus
yep, that would break things
hmmmm
curse you, minor flaws in logic
seems to work; removing debug lines