Skip trying to open browser, and crashing heroku
Refactor some early functions