Last piece, sync is now in, need to write come scenario tests