Started fleshing out templates and styles.
Improved test cases.