Worked on adding validation (client side for now)