derp, boolean logic seemed like such a good idea at the time...