Fixed backend, TODO: push to server