WIP -- wait to fix the icon and add the boundaries