Added more lisp (currently broken)