finish koan 16 and 17 - macros and atoms