[WIP] Post compose hit detection

This PR addresses #1591. This is still work in progress.