finished up 1.3
damn you emacs