knocked out first two TODOs