Finish draft of 0.1