Yeah
Merge branch 'ba'
Fixed parsing so it's more dynamic and deleting things