refactor avoidance to allow extending
Merge branch 'master' of github.com:robbles/hackwithus