Change to list
Clean up
Fix tests
remove dev flag