Add ability to extract the two types of syntaxs of Up/Down burst size + begin reorganisation of code