More dynamic templates

it's looking good.  porting over more functionality