done except for populating links