Board modal now working
Completing merge