moved stuff from wales model to base model types