Commeting almost done