Added another sample file, fixed most bugs. Still need to add tokens for
repeating operators/separators and take care of several concatenations.