organize into categories, add cockpit