Did some stuff form the TODO...