...so, honestly? i'm considering rebasing master... the situation is pretty apocalyptic right now.