current in progress version, needs changes to dynamic collections