working netcode
merge main with netcode