First shot at the 'icon' feature - still wip