More clean up / rethinking...