Completing list/map composer, almost working