Answered all of Shanaynays TODO comments and applied any necessary code changes.