WIP on the parsing