toSIngle / to many now instance methods and using map