Add in validation checking