Added Entity Selector

I quit for now