added more templates and moved stuff around