Port to retrofit

**DO NOT MERGE***

Also see #1.