change order of tests
REFACTOR - extract parser
remove emacs backup file.  oops.
extract Environment