Fixed small bug with half finished code
Commented and validation for User and Wattballmatch models