Fixed all TODO's