Working version

- Doing more or less whats needed