Almost finished both serialzers