added TODOs, reordered skeleton, added answer