add TODO: refactor note for future...