moved stuff int baseclass