Mass 2.0 Refactor (WIP)

Change-Id: I13b9bdb8b5f4564ac277da87a98f9f63e36850ab