Added half of two more things, but getting hacky and I'm tired