javascript now working
rough working draft completed
Merge pull request #1 from ichibangaijin/master

merge