Still can't save but the UI is getting there