looks good and passes tests for me. can you remove the commented code and then I'll merge.