Cherry-picked a few files from hackathon-starter