Initial commit with my own stuff

Change-Id: Ife77d326f4df2ec0aef10805cde22d721146f310