Resolve majority of TODO items