Additions to template and testing logic
Brand new shining language picker