Dev

Almost finished cleaning up login.lisp