to do: rehost and organize all