Refactor main app a little to break it up. And add modal service. :-o

-Dx