Starting from the bottom up...to see if this is even worth it :p

Change-Id: I2d25986559b99b551cd7b59a9f0adf58ab4316c0