Further breakup in separate methods; lots of todo markers for template processing