Adding final changes that were demoed at the hackathon