Closes #24

Commas everywhere!