Hacking it up to be more usable.