some ideas for refactoring
Merge branch 'availability' of github.com:duffcodester/digiquatics