Final commit

Leading up to the presentation... lets hope there's no bugs!