added final TODOs