Commiting before refactor
Refactor part 1
refactor part 1