Project Version 2

- modal now working