stuff
fixed conflict
finished network/chat