Added //TODO comments for what to do