Templates more fleshed out. Lots to do though