tested and working should be ready now