Need to fix the if statement parsing (mixup and whatnot), and then do the BB grouping