Merged with hackathon starter, need to remove the fluff