Added commenting. It's not pretty yet though.