Commit of splitted code, seperate concerns. Still a bug with the parser