Fixed bug with earlier parser refactor changing load to parse.  Removed template logic