MOD:dealwith configs and TODOs