It works!!!

Should refactor and simplify, but it works! Tested on MReV, 8.011, and
8.02!