Restore ClientInterface
Add some todos