some TODOs for @zimrapid