this also needs a little fixing but my hand is essentially dead for now so please be patient until monday :)