Starting to repair POP32r. Not working yet, but getting closer