Sinon wip

I've been slowly progressing on this one bc of a lot of stuff I have to deal with irl right now, but there shouldn't be much left to finish it.