Splitting apart logic