v1 prob 1
refactor
Prob 1 done