TODOs updated, big update about to come