trying to get edit params working
in the middle of merge conflicts
fixing merge conflicts