Lots - Group Images, more Spreadsheet

Clean up a lot of extra and slowly testing back through other
functionality. Still need UI