1) create firstTime flag in HerokuService 2) break up refreshHandler into more atomic parts.