TASK done:
- Added some new methods to make it easier
- Some refactors done