Modal finally works, have to tweak