Added encoder and decoder! :)