Bring support for O'Reilly atlas

WIP, not ready for merging.