moved stuff + proxy classes