Hopefully done with all TODO's