Commit nr6.1 - TA5 - WIP

-Tweaking around