Reworked code to use getPacketType, getPacket and array of floors
Significant cod ecomment changes with to-do lists in /* */