Begun moving details into templates