Adding rest of code for prior commit, oops
Adding TODO list