Done with some test data. Now need to templatize.