move out answers to answer model
Merge branch 'calvin'