wip: code review step 1