Initial draft of our fork