[@yoshua171]

Took a bit longer than I wanted, but I got it done. Should be a bit more consistent from here