Moving some stuff around and finally updating the template and links today.