pushed Jon's templated entries and originals