Initial commit with new code for Modals