Working towards proper update_fields