V0.1.1: cleaned up TODOs