some progress

switching workplace, transporting code