did some stuff
Merge https://github.com/antfuentes87/work