Adding to secondary repository
Started templating out