unit-testing

-Added a couple of TODO notes to work on later.