Added some fields, template almost done