These will need a bunch of work still but are a reasonable starting place. Change-Id: I91a64a6910a4acb8d657c43cd67af9e60f39616a