ToDo edit

Everything Done more editing needed to make it work right