tested and works. making separate branch for devleopment now