Hi Tim and Guix!

Stack now builds but some tests fail!

Here are the updated patches :)

- John