TODO Homework

Still troubleshooting due to my poor naming of variables. Most of it is now working.