Works as intended
Updated TODO