Update Spec

FOR DISCUSSION ONLY. DO NOT MERGE.