Added Entity.scan and Entity.query
Tests and fixes...