refactored todo's and tested completed at