Added more templates and almost have a base working thing to present