More work on #29. Not sure what to do about the extra space around the commas...