Messing around, add comment controls.