Add basic support for Psi

I'd like to add a parser for Psi soon... here are some commits that give basic support.