Incorporating changes to Bookmaker parser. TODO: fix templates.