More for EPL type system.  More work needed, though.