Updates from Slack conversation w/ joan https://gitlab.slack.com/archives/D2ZLRV71N/p1494436859843108