Fixed few issues with code, finaly able to test the things i added