Working adding/editing. Polished that.