Split off some stuff

Change-Id: Id2630db454141d0ac8486292dee7c9ca8cbef3b0