some //TODOs done