Progress on the TODO stuff

-2 things