Updated TODO
Better One Liners