TODOs for beta release