splitting things up (not fixed yet)