I think this most recent merge should have everything in working order