Feature/edit comment

This is just begging for someone to pick it up.