Cleaned up entity creation a little.
Holding onto a reference inside a container is probably one of the stupidest things I've done in a while.

- Fixed erroneous reference, using raw pointers as I originally thought with a helper to make use of
  std::find possible.