new command select and t2s
merge with master
prepare merge
finish merge
message passing
correcting merge
weird mergy things
quick fixes
finish merge
finish merge part 2