added first part of modal, which doesn't quite work yet
merged changes