Yeah agreed. I basically just grabbed the old code from Launcher there, but I agree it's a little overly stateful.