Testing and fixing in-process, still NOT WORKING.