Some progress. Fix the code now.