Working Version 2

Has bucketing rather than discrete values