New modules!
Merge https://github.com/owlen/iridis