Working initial version

Change-Id: I2561963434de6ccd8d2ce5447be03e03d304f8ee