Currently still working ...

Added some testing features ...