Reworking my fork, making sure it works.