Most of the presentation done. Filling code gaps
Update