migrated current_company stuff away from main controller
done with comments