move convert logic to new method
Merge branch 'master' of github.com:ProjectShepherd/shepherd-web