Add some TODO notes.
Git rid of unused types.