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

is this file necessary?