Brought more code up and running
Updated compare decoding