Some additional features. Compiles, but is extremely untested.