Break into small stories

#1

I would have been better if this story was small