(feat) Complete up to step7.jsx