Changes to various classes (trying to make receiver work)