A few more implementations. Almost ready for a public build.