more progress, added TODOs, etc