Merge Hackathon Stuffs