Assorted Changes
Setting up basic template