Fixed the modal, just need to work out how best to use it