changing to modals, half way done