(almost) feature-complete!