Adds lots of stuff

Change-Id: Ic08d26443bf85049aefa4f523fbf2859d91c9abd