Work in progress on comment feature