initial commit
fleshing out lex.hs
merge