Working on getting everything updated