Added in key system things and more menu items