Mark off some TODOs and add new ones