All edits and adds are in popups, unit tests work.