Working on the self commenting