Starting to make base.
Adding dispose to entity.
Not really a merge.
Made dispose.
Oh... it has splice.
Reverted line endings.