#321 (closed)
Should be passing tests, need to do some testing to make sure other formatting hasn't changed.