Update to the latest Haskeleton stuff