WIP, added todos in pip