More rewrites
Bump to v0.2.11