Change construstors (List parameters)
Add todo tags