Some validation stuff
merge