Changed entities from matrix to list

-Changed entity logic accordingly
-Added MapLocation == and != operators