Ref #18 Template updated to look a little more like it, although it's still way off