Moving all references to the end of the spec. Issue #7