whew... wip update (+added one more wip!)