Commiting a live fix - disabling buttons in this context was causing issues
Notes on the eventual hard schema I'd like to use