Mercury! And a boat load of bug fixes!