Good progress on code improvements, I think I've figure out all the issues we are likely to run into, just need to finish making the changes.