Adds some typing info, adds some TODOs, :fish: