Changes to pi.lisp, still WIP