More commenting and organizing