first attempt. modals will probably change in future