Prep for IP migration

This builds on #440. Please merge the two together.