Commit a hacked-working-sorta proof of concept