Move Actions to Entities instead of Scope. Added Geolocation options. All with unit tests.