Feature/answer mvc

DO NOT MERGE
Please check.
Same as above