J.I.C. commit, started work on icons, put code into separate functions