11: while-less macro done and tests; hw4 done!