Flatten/Inflate arrays before storing shit!
Expanded tests and clean up