Add Hangar and Metro

Add Hangar and Metro, by zdav2002, kevlar_miner and JacquiRose.