Jiangtyd/just tourney import

not done yet, but LOTS of improvements