Better preapproval checking. Closes #136