Interface definitions nearly complete.
Fix my screw up.