Finished #47 for work sites. Closes #47
Resolve comma bug. Closes #181