Moved stuff around, Added validation class