Still hacking away at TODO. Getting close now