Work in progress: interfaces, namespaces & Context related changes.