made progress on the base template