Getting there slowly... end of hackathon commit