Filled in templates a bit more