Move stuff over from fork