still needs work; but here are changes from today