Working version before fixups

This version seems to work when compiled as is (without updating stuff) on my Pixel 7a