Lightly tested and some bug fixes
Moved the currency type to a macro and added a partially completed set of slides