A lot more progress. Rewriting a lot to make it more efficient, neater and easier to understand.