PUP-198: Tethys

Owned by bonnbonn