Still fixing addEntity

Maybe I shouldn't be doing this while tired.