A more general update. Importer.java has largest change imo. Check out
updates made to the TODO as well.