big refactor for play 2.6 #71

Closed jamesward closed 7 years ago