WIP: finish ex5, no cm change

Change-Id: I74517b354ec162be32162bc9fad5ae60049ed0e8