Begin move to multi beacon format support

Will need to completely restructure code!!