Fleshed out the templates for the different stages and started to make them dynamic