[COS] Working again but still some TODOs