some progress, but what a quagmire
added