WIP working on adding icons