got a few modals working
done for the day
fixed merge conflicts