Update encoder code and continue initializing elements etc