Started work on a somewhat proper template