Feature/decoder

done