Second Aproximation

This is, deleting the before changes, what I did in just 1 pomodoro.