More work with data organization. Begun to prepare for quick loop-ups.