Bit of a code refactor. Also bears