Added more templates. Not fleshed out