about to get it working consistently