Modal in progress
Modal stuff in progress
working on modal