I am going to push that later today with some minor changes (some fixed from Claude).