code review and made some changes and add TODO.
add TODOs
cleaned garbage
add fitch request builder from other project.