wip redo names because the didn't make any sense