[WIP] Adds more extensive templates