[Final Commit]
Still next button has to be tested.