use new shot manager and node models
Merge branch 'drf'