Choices management done
A lot of bugs to fix
Updated proj file