All tests passing, add comments