split the unit package. made preferences wrapper. more stuff