#603

Here's a pull request with the progress so far.
Should I remove them or should I keep the dash?