More new stuff

Fixes #498