restructuring.

removed map -- now just uses list of objects