Modal welcome

All of the changes I've made in the 'development' branch.