Initial commit for dj1.
Merge https://github.com/danchay/dj1