No more eval
Updated Template
Whoops
Merge branch 'development'