Final stuff to commit after hackathon