Todo work

checked off some TODOs