Final commit after hackathon