First steps in getting the modals to work