Broken commit; working on OmniBlade states...