first cut at modal code
Work on modal module
Merge branch 'github.com/master'