WIP: trash

Change-Id: I551b25672a9d8fb196058adae47ff68296dcca30
WIP: works now

Change-Id: I40a80104e65f47e4ffc4103b24b24a66bc653c47