Shifting stuff over from the fork