Further development undertaken.


Signed-off-by: zelimdamian@gmail.com <zelimdamian@gmail.com>