Moved global state out of App into Global