Got a lot of modal code done. almost ready for a merge