Added FIX_CHARGE todos into the code
Feature dormant displayed on show.