Added Modal. I'm pretty much done...