Presentation commit. Lots of last minute hacks