Various updates, and trying to get mustache implimented