adding submission step and option selection logic