Updated specs, but they are still works-in-progress