re-organized a little, and added support for calling make-presentation with a class...