Added new contracts and IoC.  Made a start on Android client.