add more global state signals, start cleanup on keyboard logic, but
cant fully remove yet