Eat now template merge
Add additional files
Merge merging goodness
more cleanup