Finished part one- On part two at custom_extend