Not much has changed. Did some debugging.