some new stuff and TODOs for u