Attempting to improve templating