Working on the changes needed to lock down versions