Basic template structure and some modifications (work in progress)