Changed node storage structure to use Promise.join, and added TODOs for the missing steps