Template Updates + Personal Template

Template Updates
AE Challenge template refresh
Personal template for test usage