Moar rework

Change-Id: I5bc24a1daa562f6ab1a329e4172d03a330663f1a