rewrite of project for weekend hackathon