Added todos we need to accomplish.