Mostly working

Change-Id: Ib0d887abb42e8382f694f4d134f68fbb1d7c1b71