working edit stuff