Rewriting to reduce duplication in entity_parser
Getting down and dirty with some metaprogramming to reduce duplication (hopefully mostly down and not too dirty)
Little bit of refactoring