Started fleshing out template