Jesper, started expanding receive code