thumb2 support

This breaks automerge, lemme know if we need to fix this.