TODO partition - bring home