Pull for latest

I think this should work... hopefully I don't destroy anything here...