Moved slurpee, removed lots of copied code from driver