Began some clean-up...templates next