Virtual fence functionality working, passing tests
Merge branch 'Philip'