Adding fields, not quite finished