Post hackathon touchups

Polished and cleaned project for demo