Added functions to find_hangar for clarity and future debugging/optimization