Debugged new interface.

Updated some todo statements