Comment out some slides
Move macros to the end as bonus material