Bit more worky state, commited for bisecting.