tested and works. making separate branch for development now