Updated with changes from White Computer - 28 Sep
Added Test_Door from FC