Attempt to simplify a simple bit of app flow