core/gesture.js (5 lines):
	- line 46: // TODO: Consider touchcancel/pointercancel.
	- line 470: // TODO (fenichel): Possibly combine this and startDraggingBlock_.
	- line 650: // TODO: Handle right-click on a bubble.
	- line 741: // TODO (#1673): Consistent handling of single clicks.
	- line 797: // TODO (fenichel): Move bubbles to the front.


core/block.js (4 lines):
	- line 921: // TODO: handle removing insertion marker status.
	- line 923: // TODO shakao needs to be Blockly.INSERTION_MARKER_COLOUR ?
	- line 1530: // TODO: Improve truncation so that text from this block is given priority.
	- line 1680: // TODO shakao remove goog.isString


core/events/ws_comment_events.js (4 lines):
	- line 204: // TODO (#1266): "Full" and "minimal" serialization.
	- line 278: // TODO (#1266): "Full" and "minimal" serialization.
	- line 368: // TODO (#1266): "Full" and "minimal" serialization.
	- line 423: // TODO: Check if the comment is being dragged, and give up if so.


core/block_svg.js (3 lines):
	- line 356: * TODO shakao migrate filter definition + setting to /zelos/constants.js
	- line 672: // TODO need to pass starthat height to renderer
	- line 975: // TODO shakao check if same as Blockly.Colours.insertionMarker


core/icon.js (3 lines):
	- line 155: * TODO shakao remove?
	- line 186: * TODO shakao remove?
	- line 247: // TODO (#2562): Remove getCorrectedSize.


core/field.js (3 lines):
	- line 270: * TODO shakao verify serializable defaulting to false ok
	- line 290: // TODO (#2884): Possibly add CSS class config option.
	- line 291: // TODO (#2885): Possibly add cursor config option.


core/variables.js (2 lines):
	- line 47: var blocks = ws.getAllBlocks(false).filter(block => !block.disabled); // TODO shakao verify filter needed
	- line 445: // TODO shakao remove goog.string (pxt htmlEscape function)


core/comment.js (2 lines):
	- line 486: // TODO (#2917): It would be great if the comment could support line breaks.
	- line 572: // TODO (#2917): If 2917 gets added this will probably need to be updated.


core/field_number.js (2 lines):
	- line 74: // TODO shakao check if need numRestriction, if opt_value needs default
	- line 531: // TODO: Handle cases like 'ten', '1.203,14', etc.


core/css.js (2 lines):
	- line 121: // TODO move to field
	- line 851: // TODO shakao move numpad


core/workspace_comment_svg.js (2 lines):
	- line 255: this.blurFocus(); // TODO shakao: verify if needed
	- line 345: // TODO: Do I need to look up the relative to surface XY position here?


core/contextmenu.js (2 lines):
	- line 93: var menuItem = option.separator ? new goog.ui.MenuSeparator() // TODO shakao remove goog
	- line 313: // TODO shakao check if uneditable comments still work


core/bubble.js (1 line):
	- line 528: // TODO: I believe relativeLeft_ should actually be called relativeStart_


core/options.js (1 line):
	- line 122: // TODO shakao check if we still need this


core/pxt_blockly_functions.js (1 line):
	- line 137: // TODO: Ideally this should only check for function calls, but changing the if condition


core/blockly.js (1 line):
	- line 200: // TODO (https://github.com/google/blockly/issues/1998) handle cases where there


core/renderers/common/info.js (1 line):
	- line 518: // TODO: More cleanup.


core/bubble_dragger.js (1 line):
	- line 237: // TODO (fenichel): move events for comments.


core/field_textinput.js (1 line):
	- line 491: // TODO shakao figure out how to add arrow with new renderer


core/renderers/zelos/renderer.js (1 line):
	- line 129: // TODO: Returning this is a total hack, because we don't want to show


core/inject.js (1 line):
	- line 447: // TODO (#397): Fix for multiple Blockly workspaces.


core/workspace_comment_render_svg.js (1 line):
	- line 604: // TODO is there a better way to do this?


core/field_image.js (1 line):
	- line 208: // TODO shakao verify we want this


core/field_variable.js (1 line):
	- line 322: // TODO (#1513): Try to avoid calling this every time the field is edited.


core/renderers/measurables/rows.js (1 line):
	- line 179: // TODO: Consider moving this to InputRow, if possible.


core/field_variable_getter.js (1 line):
	- line 367: // TODO (#1513): Try to avoid calling this every time the field is edited.


core/mutator.js (1 line):
	- line 194: // TODO shakao check if this.block_.workspace.dragSurface necessary to pass in


core/flyout_base.js (1 line):
	- line 195: // TODO: Move GAP_X and GAP_Y to their appropriate files.


core/workspace_svg.js (1 line):
	- line 1585: // TODO (#1719): Properly offset comment such that it's not interfering


core/block_dragger.js (1 line):
	- line 377: // TODO shakao remove custom event (use Events.get)


core/flyout_vertical.js (1 line):
	- line 222: if (scrollDelta.x) { // TODO shakao: check if need 'hasTwoScrolls'


core/toolbox/toolbox.js (1 line):
	- line 371: // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.


core/workspace.js (1 line):
	- line 452: // TODO (#1559): Possibly delete this function after resolving #1559.


core/keyboard_nav/ast_node.js (1 line):
	- line 658: // TODO: Make sure this is in the bounds of the workspace.


core/utils.js (1 line):
	- line 253: // TODO (#1169): Implement support for other string tables,