add more todos
fix ordering implementation