shuffling things around to get them working... the way I want them to right now