Some todos and structure