Finalizing some stuff for presenting

Bringing things together and finalizing everything for presenting. It is
still far from complete.