more reorg
arrays working, needs cleanup