There are TODOs mentioned throughout the code. Fix them or make a relevent issue to keep track of them