Update README, consolidate TODO