App structure plus flow updates & timer updates