Additions to https://github.com/andrewjpage/fastml