Some more work on the base template