merge what i worked at the office with this repos.

Still need to solve one problem