I’m also working on this.

I need to redo some parts