Myg000 70

Some code might not be the most perfomance but there wil be a refactor, so we will leave it as it is, including some commented unit tests
Same