Things compile again... :)

All important things missing marked with TODOs.

Change-Id: I593d5f37310d23ebf6baa6f32dba7587e3147487