Additional interface and functional changes. Not ready for prime time...