working on draw/shuffling
resolved sorting bug