Rewrote to Cover Other Entities

Now mcmonkey is gonna tell me what's wrong  because he's jelous