Major overhaul. Will allow more dynamic use for BX versions that are ahead of the tool