a bit more Progress on my WIP.