Bunch o' changes, but it ain't working yet