Moving templates around - sketching out a repo page view
Conflicts