some comments to changes in controller
Working on alternative front-end
Merge! MERGE