please add TODO in comment we need to work more on those section. i know we need to get out something useful but we can at least keep track of what needs to be cleaned.