! work on the last known missing function ... still missing some stuff though
! Basic template cleanup