one through three now working
all javascript now working
Merge pull request #351 from john-hill/PLFM-1792-d

one through three now working