Merge Adam changes into kernel
Add Adam specific files