Reimplementing Rules for parsing

Added Context and more templates