passed test 32 (and it only took 3 hours for one line of code....)
passed test 32 (post merge)