Add validation & better commits for each quess