Cleaning up master, will merch with branch if that's ever something to pursue?