Feature/answer mvc

DO NOT MERGE
Please check.
These are literally the same functions. Is there a reason for this?