Added basic comments functionality