Feature/first pass atn

Dan here is our latest changes and reorg of the Makefile.