Starting work on .next

Change-Id: I4b07a90321d9bf5e96a358db61eba8335b530987