Reorder TODO items
Merge core into internals