Sqwiggle Companion PR

This is a companion PR for #762.