Users, better validation
Merge random shit