Cancel and done buttons FINALLY working. Whew.