working on bugs on work page
fixing bugs with work page
testing bugs with work page
Merge remote-tracking branch 'origin/jeff' into tal
sync