Compile unit fixed + WIP refacto for Answers