changed maps to lists
tests in main