Merged with Hans's changes, now passes 21 tests!