Added decorator, still need to clean up logic.