comments work in progress
Comments need fix for nil