work on match dynamics
merge
make modal work