finishing initial implementation of Parser