move message receiver stuff into general area