Fleshes out the basic template a bit