Lot of refactoring. TODO user cabinet settings. Needs to add ActiveMerchant.