(feat) Complete up to step8.jsx