making progress on comment and feature implementation