got some ntworking going
merge conflicts