Added alot

Change-Id: I74513ce6bc38777789313e5159fd8002ca14288e
Added alot more

Change-Id: Ic94aa9f6f979b4da4c2b8b35076558b9fb453803