start working on Token remapping and connecting
ignore project notes
add some tests