going to merge Connor's stuff... brace for impact