New todos in README
Better way to map functions to args

Nested ifs just don't cut it