comment out feature thing
Some preliminary interface changes.