added TODOs, initial build 1.0.0 ready.