Some stuff

Not everything i've done, but I know for definite that this bit works