more todos and analysis