Building out comments; expanding needs work