Updated todo. Found a good psyntax.pp