shit's not working. move everything to the client