Building out commentary features