Did most of TODO 4 and most of TODO 3
Did most of TODO 4 and most of TODO 3