Mostly works

I can’t commit properly sorry not sorry